Merge "Update tests/cts/net/api23Test/AndroidManifest.xml"