Merge "Ensure ADB is stopped when enabling Test Harness Mode" into rvc-dev am: e23c8dd158 am: 29fe05751e am: 0775a11cbd am: b515259d18
Change-Id: Iea2d428c228853d7c379c63e0c1836c0938beb8f
This commit is contained in: