[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

Change-Id: Ibb750d164df46355bf390670f362a0e057d41322