Import AndroidX from build 7687115 am: d2b7587345

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

Change-Id: Icae8425ee837ab7db08f7be593d954914ac69573