Merge changes from topic "presubmit-am-e90db0a8f9074c3580fc4e841cacdedf-sc-v2-dev" into sc-v2-dev-plus-aosp am: 200cf5ab4d

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

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