Merge "ConnectivityManager: Address review comments from aosp/1595396" am: 1515b6c96d am: 0eadb2848d

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

Change-Id: I9fe5fb1cbbbae44e91efe90107c220a7b64d9755
tree: 9f003e44d81bd52a47d7d473fcffcafa485525e1
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING