Merge changes from topic "presubmit-am-e2f7e1ee30b84cf49e4416361b5c6c8c" into...

Merge changes from topic "presubmit-am-e2f7e1ee30b84cf49e4416361b5c6c8c" into sc-qpr1-dev am: 77bdd14f am: 37712db5 am: e6415013

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/16794780

Change-Id: Iaa2d3ab34c170a1651532490137fb4c4d50e33cf