Merge changes I9e06f025,I413c3803

* changes:
  Update supplicant AIDL VTS tests to use the new version of stopWifiFramework().
  In supplicant VTS test setup, make sure that the wifi hal is stopped before starting wifi.