[automerger skipped] Merge "Allow not overriding user decision for app op...

[automerger skipped] Merge "Allow not overriding user decision for app op permissions." into sc-mainline-prod am: ee7ba1fb -s ours

am skip reason: Merged-In I32adc38d61b8b9ba8688ae6c5abb9e356ddcd120 with SHA-1 8ff8b3af is already in history

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



Change-Id: I1bda4f517fe5a118bf6b224f6451133478b6f0fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>