[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am:...

[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: d0e193c0 -s ours am: 723e4644 -s ours

am skip reason: Merged-In Ib6c4ea6b8e69604839ada1c58ec10b20a6a77f93 with SHA-1 bcca7b76 is already in history

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

Change-Id: I2e8e4e8e6af164a91f849bf1236a7048ce4ec477