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

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

Change-Id: I30a02b57b58cbd3197faa614d036daec7ff06bd6