Merge "Fix ConnectivityManagerTest @hide Wifi API usages" am: 7304f015 am: c975b2d9 am: b28775fb Change-Id: I5e34330954312412e25964e1e86c3997acf38fd8