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: 1a9ddd01 am: f6e0855b

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



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