Merge "Fix source incompatibility issues in multiple permission classes" into...

Merge "Fix source incompatibility issues in multiple permission classes" into udc-dev-plus-aosp am: 17402ad8

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



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