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

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

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