Merge "Use network list in UNDERLYING_NETWORKS_CHANGED" am: a6f4de3432 am: 04b88cae4f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1458448db36acce05cad6ba9f41b4d7d11bc684a