Merge "Merge "Consolidate point where ADB is enabled for Test Harness Mode"...

Merge "Merge "Consolidate point where ADB is enabled for Test Harness Mode" am: d9c4a359 am: 96d1e8b9 am: 3fc294bb" into tm-d1-dev-plus-aosp am: d65672c6 am: 111f3d62

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2105009



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