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