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

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

Change-Id: I05777492db3ab9d7b4c6c69131f9404780e4e832
tree: e5f7f2563ac016ac594f66717f139f0b0d5ec7b3
  1. framework/
  2. service/
  3. test/
  4. OWNERS
  5. TEST_MAPPING