Merge "Generalize support for underlying networks." am: ca830d9239 am: 51c973d4b7

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4748f059d035219adcec0a75dac53968ea82af84
tree: 3b5dc884e0fbbe457a1b03fadf5f90c1db4ea48b
  1. core/
  2. services/
  3. tests/