[automerger skipped] Merge "Consolidate point where ADB is enabled for Test Harness Mode" into tm-dev am: 92bc449565 am: 3c0172c034 -s ours

am skip reason: Merged-In I518415dda275bc3d563820ead611e5f017368c95 with SHA-1 dfca3dbdb6 is already in history

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

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