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

Change-Id: Iae4ec079cec196dcb529bbc1bd0d6e3693e60f8f