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

Merge "Emphasize possibility of multiple networks with same transport" am: f9c9dba0 am: 9e29893e am: dfedef0c am: e9be2803

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

Change-Id: Ic55592c91406dd4e83b346fbb4d55512fb03620d