Merge "Fix auto permission grant notification grouping" into udc-qpr-dev am: ad8faad4

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



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