[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 069a69b988 -s ours am: 354083d898 -s ours am: 0be54aa2e6 -s ours

am skip reason: Merged-In Ie1a8c72faa378d7643b6c1d43928d83c9d740a6b with SHA-1 fcf093ee0c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/swt/+/15567340

Change-Id: I907cc91bc6adf878396b05705f59662fc674b702