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