Merge "ConnectivityManager: fix potential NPE" am: b688dd18ab am: 52f0931888
am: 2b07754b8f

Change-Id: I6f487ce9da656610c939ddc78e834ac8ef5f8135
tree: 1cf6313b69d62fc84aea3f9c906deddccebc25a6
  1. core/
  2. services/
  3. tests/