Snap for 10453563 from cf0a9cedf00f977f9093ef1808b57bc12ab41750 to mainline-permission-release

Change-Id: Icd3eab8e4f8afc38e271437660c57f41cd1ca15c