Merge "ConnectivityManager: Address review comments from aosp/1595396" am: e3aff37ecf am: 1d73c8107f am: 7acd4c1c84

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

Change-Id: I05777492db3ab9d7b4c6c69131f9404780e4e832