Merge changes from topic "presubmit-am-0ae94bad99a44ca49b50a370b1edd489" into sc-qpr1-dev am: ffbdb7457b am: 6f1e9080e1

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

Change-Id: I011a5bf691a9686bb52d2cecb9574a90d275c12a