Merge changes from topic "presubmit-am-70d433cdc501409e9f5f8ec6b0cd6194" into sc-qpr1-dev am: cf63673fbf

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

Change-Id: Ic2c8ff1abdf52bc623ecde3039cdec4c2f97f3f3