Merge "Emphasize possibility of multiple networks with same transport" am: 74adc3a813 am: a7472710a5

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

Change-Id: If641ab6d8ab300048c5666eea399e3ab8404d826
tree: b9c4d6e2643e0a6354e8081a9f79e09502963f5f
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING