Merge changes from topic "presubmit-am-a1f7df834b524e5b9dc602ce3fd76ece" into sc-qpr1-dev am: 897b119623 am: f0a05d6dbb

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

Change-Id: Ic4cf4efa085ae2b0f1c51f727916d30c107b6ba8