Merge "[automerger skipped] Merge "DO NOT MERGE Exclude testPermissionDiffCert from cts-known-failure.xml" into oreo-cts-dev am: 7737a671e8 -s ours am skip reason: subject contains skip directive" into oreo-mr1-cts-dev