Snap for 8941678 from 2d50582619688b8c5fbb38f85d81179bc1dfb7ec to tm-qpr1-release am: ea45483854

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

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