Merge "[DO NOT MERGE]Revert the changes to tests/tests/permission2/res/raw/android_manifest.xml in aosp/1114516." into pie-cts-dev