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

Merge changes from topic "presubmit-am-4d7b136761494a969d4880fe816d3198" into sc-qpr1-dev am: 0d26fb4c

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

Change-Id: I34d636a9279b31eb84c778ca4245bd7ea06e8648