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

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

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