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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida4e4d7b6d607d6c9f6efc2d06732f7826f7942e