[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: dd257bea30 -s ours am: 232ee0dda8 -s ours am: ff9436e97e -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/1740462

Change-Id: If12448e12e0ffc656def74199875ad38b44d0189