[automerger skipped] Merge "Expose some APIs from ConnectivityManager" am: 8e4ae68ddd am: a2ec6c3696 am: 8242b68d7d -s ours

am skip reason: skip tag Change-Id I1fb5ecfbe37878ba3534e6c6c7599ca29db2735c with SHA-1 97fb10a3a6 is already in history

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

Change-Id: Id36817eef371fd456bbb4f95cd713e43b833bae9
tree: ce045a6625418a6d8c650129598ec18e0eeb9ce7
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING