Merge "Test out a new version of google-api" am: f17b5cb6d1 am: 26fc2bb0c6

Original change: https://android-review.googlesource.com/c/platform/prebuilts/tools/+/2035164

Change-Id: I72a631de860420a818c3caf8d6f627e8d9d9860a