[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 6301ff0095 -s ours am: 8f2306ace3 -s ours am: 5a67e63604 -s ours am: 04173b3697 -s ours

am skip reason: Merged-In I2a5da348eba104a7d06d6c0acb3cd56b770142a1 with SHA-1 a292f5280e is already in history

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

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