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

[automerger skipped] Merge "Fix source incompatibility issues in multiple permission classes" into aosp-main-future am: 22ebafdf -s ours am: 2b93b348 -s ours am: 1c029801 -s ours

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

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



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