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

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

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

Change-Id: I6140e3d297e9823c89dd4f75e25d2ce2c734e356