Merge "Handle null pointer cases in ConnectivityService" am: 7b38530eac am: 0f2b3c67e7 am: 57a82edf0b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669646

Change-Id: I8460ed44fb1bc72a8533d2e57012ccc623f8ca73
tree: de759ea41606ea640975eb0183a424988f8bdda9
  1. framework/
  2. service/
  3. services/
  4. test/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING