Merge "Make sure PermissionPolicyTest#testPlatformPermissionPolicyUnaltered is not broken anymore by changes to AndroidManifest.xml"