Merge "ConnectivityManager: fix potential NPE"