aml_per_331115020 (9164532,com.google.android.permission)
Snap for 8564071 from 6661c46def7a4e79589003500e402827370bd285 to mainline-permission-release

Change-Id: I49e68a3bc35e3694cf08a3387612d559edfd5ae9