[automerger skipped] Import AndroidX from build 6390815 am: 283795f2c4 am: d2582c0ed4 am: 1b58c074fc -s ours

am skip reason: Change-Id I7d68920d48b05ac5066249fd25b107b71a182784 with SHA-1 283795f2c4 is in history

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

Change-Id: I09f2df95aca0ed002c779220bcb21b9e2b376e83