Merge changes from topic "presubmit-am-6ef15b76a3ec4704adcb411bc750a363" into sc-qpr1-dev am: 42e4e74fd9

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

Change-Id: I5a0e6aa609c8a1d2fa79262c92ac91c4bb12b31f