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

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

Change-Id: I6653d668d1fdc4370f8d5db1da41214b9755bb4d
tree: c8b5ab69f365c12b1879aa62fc35e01cece98235
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING