Merge "ConnectivityManager: unhide methods with Handler argument" am: e940d5458d
am: 5c5850d2f0

Change-Id: Ie563d1b8f64e2b42d3a146495dfdfafdd5e1965a