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

Merge changes from topic "presubmit-am-e2f7e1ee30b84cf49e4416361b5c6c8c" into sc-qpr1-dev am: 77bdd14f

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

Change-Id: I7d419efea3e9a4465956b5d4d3c14183fd3c4710