Merge changes from topic "presubmit-am-4ead60fb042c4164b62aad130f125c10" into sc-qpr1-dev am: 47e08fe973

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

Change-Id: Id9eb15ef1eb859b18a99bb775d518c283d5543d9