[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 099368914a -s ours am: 1c3556a78a -s ours am: 717fe25d75 -s ours am: 19ee325bcb -s ours

am skip reason: Merged-In Ib3ace89452ac409b7230682a3f72f75144f18984 with SHA-1 872ca0c10f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/adb/+/17544786

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