Merge "Code cleanup" into main am: 15f52860cc

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

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