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

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

Change-Id: If641ab6d8ab300048c5666eea399e3ab8404d826