Merge "Handle null pointer cases in ConnectivityService" am: 452dc83724 am: b3087508eb am: dddb56c96a

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

Change-Id: I8460ed44fb1bc72a8533d2e57012ccc623f8ca73