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

Merge changes from topic "presubmit-am-d5c6ef964b1849ada3e1e87a6de8c167" into sc-qpr1-dev am: 8587d6dd am: a50f3d4f

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

Change-Id: Ie0d8cde1fb4c57491a4be5162659c8fba734135d