Merge "Import AndroidX from build 8484248" into tm-dev am: 36eeb4e89f

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/sdk/+/17918817

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