Merge "Consolidate point where ADB is enabled for Test Harness Mode" am: d9c4a359 am: 96d1e8b9

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



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