Merge "Consolidate point where ADB is enabled for Test Harness Mode" into tm-dev