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

Change-Id: I72e114037ce6a0ec53863749b8ffa34513c9fdce
tree: a96954f714e69e5a7707b057c1f65575f76e10ad
  1. core/
  2. services/
  3. tests/