Merge "Ensure ADB is stopped when enabling Test Harness Mode" into rvc-dev