Merge "Fix ConnectivityManagerTest @hide Wifi API usages" am: 7304f01576 am: c975b2d949

Change-Id: Iab3c8e256b5d948378d7c83d2882587234091980