Merge "Emphasize possibility of multiple networks with same transport" am: f9c9dba0fb am: 9e29893e5a

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

Change-Id: If641ab6d8ab300048c5666eea399e3ab8404d826