Merge changes from topic "networkagent-set-underlying-networks" am: dccf7eda5e

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

Change-Id: I94fd855f9b03d7487b1ebc8288be7f95e12fbe4f