Merge "Emphasize possibility of multiple networks with same transport" am: cf514f511d am: ee28d79784 am: 32cee1bf1b

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

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