Merge "Add tests for secure USB debugging"