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

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

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

Change-Id: Ie0d5d5094f582d849aa20a289aca60c69e623d09