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

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

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



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