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

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

Change-Id: I2821348230f093569e8149779a88d31ce2b0b322