Snap for 9824955 from a364c8ae7866fe3e92370d6a0ce84283a7a5ba5f to mainline-permission-release

Change-Id: I46c252be631a6f5644a6918d95d53da3e77f2456