Merge "Update CTS ConnectivityManager tests to work with L release." into lmp-dev