[automerger skipped] Merge "Expose some APIs from ConnectivityManager" am: bcf2a79ec8 am: cc2827494a am: 59d8bd7380 -s ours

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

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

Change-Id: Id36817eef371fd456bbb4f95cd713e43b833bae9
tree: 388bff3bf6d7f63adbeaf1f37c470003baf1479c
  1. framework/
  2. service/
  3. services/
  4. tests/
  5. OWNERS
  6. TEST_MAPPING