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

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

Change-Id: I2821348230f093569e8149779a88d31ce2b0b322