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

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

Change-Id: I9c360de7101c0332360186055f915e0de6aba574
tree: a1877631e70aee25d51527700b34bdd9be0c548b
  1. core/
  2. services/
  3. tests/