Import AndroidX from build 7687115 am: 5b7c6e2be8

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

Change-Id: Ia39430cc3bdd43de6b13edafe5ee459bf629951b