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

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

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

Change-Id: Ib65a5583e403fa4a7a737538aaad05938228f92d