[automerger skipped] Merge "Allow Test Harness Mode when secure ADB is...
[automerger skipped] Merge "Allow Test Harness Mode when secure ADB is disabled" into rvc-dev am: fa25797f am: bd9a23dc -s ours
am skip reason: Change-Id If095c379f70a6ca7b0cf3be8b30dfa43b85633e3 with SHA-1 ef36a25f is in history
Change-Id: I686032968ae08278387e9e35481fbe9b883b7981