Merge "Fix VTS test which turns off radio." into oc-mr1-dev am: 6fb8b93bb4
am: 8809d4f0d6

Change-Id: I501d1a2db1ac38fb9366ce33e47a9682d981c781