Merge "Set underlying network of VCN" am: 74ef57b885 am: 05689c78b5

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

Change-Id: I79c442772c62158110883119337d1811243eb3f3