Merge "[automerger skipped] Merge "DO NOT MERGE: Add PrivappPermissionsTest to known failures" into oreo-cts-dev am: ebcb69a191  -s ours" into oreo-mr1-cts-dev am: 062c8a63ce  -s ours
am: 1abac5a565  -s ours

Change-Id: Ifa1137a5d0b1b342633f65f08e6352a91139c5e4