Merge "Allow Test Harness Mode when secure ADB is disabled" into rvc-dev