[automerger skipped] Merge "Merge Android 12" am: d1cae63beb -s ours am: 12132a97ff -s ours

am skip reason: Merged-In I9bb827bc5cf4f2bb5dc7cbb81d26aa44b074d366 with SHA-1 069a69b988 is already in history

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

Change-Id: Ida6de2214b838e304e204338fe337ab269bb3de1