[automerger skipped] Merge Android U (ab/10368041) am: 5a307cc7 -s ours am:...

[automerger skipped] Merge Android U (ab/10368041) am: 5a307cc7 -s ours am: 529bb657 -s ours am: 8a204157 -s ours am: f6449044 -s ours

am skip reason: Merged-In I5f5ccef5d20f25df608248097d497adb190214b6 with SHA-1 8f86fe6a is already in history

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



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