Merge "Add additional adbd related tests to mixed staging" am: 8153bc40 am:...

Merge "Add additional adbd related tests to mixed staging" am: 8153bc40 am: bc7d7014 am: b00ceb10

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



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