Merge "Fix some compilation issues with new androidx version." into...

Merge "Fix some compilation issues with new androidx version." into udc-mainline-prod am: 9b509c6e

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



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