Merge "Update CTS tests to reflect ConnectivityManager API changes." am: 54a417d822
am: 1fd5b6b9a3

Change-Id: I39e3208298ce90cf014074e1f82a4cc5957ff68e