Merge "[automerger skipped] Merge "DO NOT MERGE Exclude testPermissionDiffCert from cts-known-failure.xml" into oreo-cts-dev am: 7737a671e8 -s ours am: 6c6fe75160 am: 99b877403c -s ours am: 9c864324fd -s ours am: 011cbfd8c2 -s ours am: c40493a5fc am: 3bdd554e30 am: 2b7bcd571c" into qt-qpr1-dev-plus-aosp
am: 2d4d4a36e3 -s ours
am skip reason: subject contains skip directive

Change-Id: I3d24b8e4c5c695373df2c12530832dc1140751fd