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

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

Change-Id: Ibf7df346fcf8216daf0ed84ffdd692f9675ad989