Merge "Bug #530599 android.net.cts.legacy.api22.ConnectivityManagerLegacyTest - testStartUsingNetworkFeature_enableHipri - change the WIFI state" into marshmallow-cts-dev am: f95a8d3 am: 015e693 am: d6a0b39 am: 063ebea
am: 62d7a69

* commit '62d7a6985e669d72319ec0c1541f7d35d408ca87':
  Bug #530599 android.net.cts.legacy.api22.ConnectivityManagerLegacyTest - testStartUsingNetworkFeature_enableHipri - change the WIFI state

Change-Id: I18a81a7d0908e6f5292a9dcbe21be642a4de4e1b