Merge "Update golden copy of android_manifest.xml" into nyc-dev