[automerger skipped] Merge "DO NOT MERGE Add CTS for new permission check" into pi-dev am: 2e9ca2fedd -s ours am: b1df34b4e8 am: a4fb6087c4

Change-Id: Iaff08b02d874bcad8f83e4ae60684338c8e5c215