[automerger skipped] Merge "Fix source incompatibility issues in multiple...

[automerger skipped] Merge "Fix source incompatibility issues in multiple permission classes" into udc-dev-plus-aosp am: 17402ad8 am: 6aec1960 -s ours am: 0d1f9059 -s ours

am skip reason: Merged-In Iaf7825a65d65ad6bc97b1f89e9fe3372e017b5f9 with SHA-1 9e2f6fd2 is already in history

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



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