Merge "Re-enable testPlatformPermissionPolicyUnaltered presubmit test"