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

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

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



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