Merge "Update tests/cts/tethering/AndroidManifest.xml"