Merge changes from topic "presubmit-am-c0e5f73d841f47b099ed57e5d1b6e2b3" into sc-qpr1-dev am: 3f460daa87

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

Change-Id: I7ac9451df15dbb3f9286eab4355c7068a1c60f2b