Merge "Update androidx build sdk to 30 instead of current" am: f49a5bb902

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

Change-Id: If50778b731468e265d7d9c2a4403a3afac1fb6de