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

Merge "Fix some compilation issues with new androidx version." into udc-dev-plus-aosp am: d98674fd

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



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