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

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

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