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

Change-Id: I70ee0130473c959b54899674802f721446c2ff4b