Merge "Revert "Import AndroidX from build 6620107"" into rvc-dev am: 9652a88bf5 am: 615b96bf4f am: 0df49dc1ab am: f09f955e38

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

Change-Id: I7807fb14f9e3b02a851dfed3b5a99dda185d828a