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

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

Change-Id: I8417a8af1202c01803c61ff54363b45960af6965
tree: 45414927af3db88ee99513ac6bccd848158356ee
  1. framework/
  2. service/
  3. services/
  4. test/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING