Merge changes from topic "adbd_host" am: 3daa129a

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2590206



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