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

Change-Id: I4c6a51c979b6db7d7921be73a95f8171d3f7d0af