[automerger skipped] Role: Fix resolving non-exclusive default holders am:...

[automerger skipped] Role: Fix resolving non-exclusive default holders am: 7f2b88c8 am: 5f430bc7 -s ours

am skip reason: Merged-In Idd986b1c49c0be5ae5f060fe436d95e5de2c01f7 with SHA-1 7f2b88c8 is already in history

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



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