[automerger skipped] Merge "Consolidate point where ADB is enabled for Test Harness Mode" into tm-dev am: 92bc449565 am: 81a9be3118 -s ours am: 0c35b5ab19 -s ours am: 4976002879 -s ours
am skip reason: Merged-In I518415dda275bc3d563820ead611e5f017368c95 with SHA-1 f8287f503e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18687283
Change-Id: I6d843ecbe9f7750cbd719c52ec147ad07fa11807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: