Merge pull request #12666 from Matt-Swift/master Add tapserver BBA and Modem Adapter UI options to Android
