Merge changes from topic "presubmit-am-4ed76786643b44f5957745de154e4f2e" into...

Merge changes from topic "presubmit-am-4ed76786643b44f5957745de154e4f2e" into sc-qpr1-dev am: bd0f2936

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

Change-Id: Ie12d2a5b78062badcfc7d97045155ecb83b6634a