Merge "Rename VcnUnderlyingNetworkPrioirty to VcnUnderlyingNetworkTemplate" am: 60ad179dff

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

Change-Id: Id342a2d1f94443765e97ea5a7c397bdbef6a72a8