[automerger skipped] Merge "Import AndroidX from build 6495117" into rvc-dev am: d58878b7fa am: 1af63d79ee -s ours

am skip reason: Change-Id I7d43d05c40f8d5819de39321b7bda2cbbb17fe8c with SHA-1 ce701eac6e is in history

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

Change-Id: Ie36754c7c513d431c95951088263233f7ce83f21