[automerger skipped] Fix source incompatibility issues in multiple permission...

[automerger skipped] Fix source incompatibility issues in multiple permission classes am: d2592489 -s ours am: 08c59808 -s ours am: ec3f4f73 -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: I498f5125f5097662b5e22462d86566446cddbd3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>