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

Merge changes from topic "presubmit-am-ad6149d818f24dfbae2f9fba326f2ab8" into sc-qpr1-dev am: 15cbc3af am: d84e59df

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

Change-Id: I7a9e5e0061afd367ad260e4cf32b8bc5a2a56aef