Role: Fix resolving non-exclusive default holders am: 7f2b88c8 am: b1ee6b01

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



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