Merge "Consolidate point where ADB is enabled for Test Harness Mode" into tm-dev am: 92bc4495

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



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