Merge "Update tests/netlegacy22.api/AndroidManifest.xml"