[automerger skipped] Merge "Consolidate point where ADB is enabled for Test...

[automerger skipped] Merge "Consolidate point where ADB is enabled for Test Harness Mode" into tm-dev am: 92bc4495 -s ours am: dfa4b49b -s ours am: 6be1b2c3 -s ours

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

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



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