[automerger skipped] Merge master build-tools into rvc-dev am: 4222b7e850 am: 67e4cad8e3 am: a18acac985 -s ours

am skip reason: Change-Id I0b0e32f05c6166187e310a9ec03511b0bfa0e19c with SHA-1 61bbdf2740 is in history

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

Change-Id: I423d2d814f1b0e364cdc717cec7e1a9b1563da24