Merge changes from topic "networkagent-set-underlying-networks" am: dccf7eda5e am: 5b849b3cdc am: 06af1de3a0

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

Change-Id: I6a96b80ab6d94e0cfe4b202ec5aa4a3096c2f090