Merge "ConnectivityManager: Address review comments from aosp/1595396" am: e3aff37ecf

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

Change-Id: I6653d668d1fdc4370f8d5db1da41214b9755bb4d