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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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