Merge changes from topic "presubmit-am-6ef15b76a3ec4704adcb411bc750a363" into...

Merge changes from topic "presubmit-am-6ef15b76a3ec4704adcb411bc750a363" into sc-qpr1-dev am: 42e4e74f am: 724ffa4c am: 8e979618

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

Change-Id: Ibf7858eee8b5fdcb012d7cdf3d6f06d43556418e