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

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

Change-Id: I8417a8af1202c01803c61ff54363b45960af6965