[automerger skipped] Merge "Revert "Revert "Note network interfaces based on transport""" into sc-dev am: 33045422 am: 5af9e45c -s ours

am skip reason: Change-Id I4e928fac8a57a9b1fc758a44af2a5719b8c871b8 with SHA-1 2d17d202 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a2bb05ea9625d16ef8052c6d617672807fa3d01