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

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

Change-Id: I9fe5fb1cbbbae44e91efe90107c220a7b64d9755