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

[automerger skipped] Consolidate point where ADB is enabled for Test Harness Mode am: f8287f50 -s ours am: 059a89ed -s ours am: cc712dc7 -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: If883777eb3af5ae818c98d3d2cff649352ae0df5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>