aml_per_341110020 (11065087,com.google.android.go.permission,com.google.android.permission,com.google.android.permissioncontroller)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24698392'] into sparse-10726381-L92000000963160625.
SPARSE_CHANGE: I6b14068be213db4f0426c2ea1f4acbd469ff43c5

Change-Id: Ic811e4b07c2f76b85ea125649ffa147899f08ae0