Merge "Update to use new ConnectivityManager API." am: 161f5ec3e9
am: 525b0dbc17

Change-Id: Id798a6b94be2c699c4de1c294e418a621b0adea2