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

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

Change-Id: I0f47c616a084efdf75d4d6147da3a9e458f20468