Snap for 8705225 from ff9e945e1b5b5966cfc75b3c954e62076ea9ea00 to mainline-permission-release

Change-Id: I348e3c7cf3acc934673be20640d4000eabc4c7b4