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