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

Change-Id: I45b44946d78923f1efc164039fd32c438523ad05