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

Merge changes from topic "presubmit-am-e2f7e1ee30b84cf49e4416361b5c6c8c" into sc-qpr1-dev am: 77bdd14f am: 1abf694a am: 2c7d252e

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

Change-Id: I5d974e528c12289dcaf0d7273843e34c88d670ce