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 am: 197d4d1f

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



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