Snap for 8414339 from fd51233d0ee7667e37505c896480230cc50eac9e to tm-qpr1-release am: c30f2e552a

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

Change-Id: I2c4f6a14e8e74195227761fe83f366c381e93414
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>