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

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

Change-Id: I9c360de7101c0332360186055f915e0de6aba574