Merge "Code cleanup" into main am: 15f52860cc am: 8729ef54f4

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

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