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

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

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

Change-Id: I85a6f16fab4e87f39e9ca4f040cdf5f6a17dfde0