[automerger skipped] Merge "Do not merge Made permission dialogs...

[automerger skipped] Merge "Do not merge Made permission dialogs non-dismissible" into udc-mainline-prod am: 9e27a5ad -s ours

am skip reason: contains skip directive

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



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