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

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

Change-Id: I0b35ef7e2dbffc9bdce4ecf1e938b3dd0bcacdf7