[automerger skipped] Merge "Note network interfaces based on transport" am:...

[automerger skipped] Merge "Note network interfaces based on transport" am: 8334a265 am: cd65235a am: 81728832 -s ours am: 1f26de00 -s ours am: 414f0f91 -s ours

am skip reason: Change-Id I4e928fac8a57a9b1fc758a44af2a5719b8c871b8 with SHA-1 84f8c484 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8a1e597905b77b54593052481759359d8c4f92cc