aml_per_331115020 (9164532,com.google.android.permission)
Snap for 9042845 from 477ac28002a547ac001a1374134f2e6535f9e471 to mainline-permission-release

Change-Id: I717a100d305bd69cfef8caac3903b5d2946f3df4