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

Change-Id: I8d3f5479bb4a4a8fabe45974898ff2dac0e76332