Merge "Generalize support for underlying networks." am: 72c26b883f am: 6731b9992f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4748f059d035219adcec0a75dac53968ea82af84