Merge "Update Tethering/tests/mts/AndroidManifest.xml"