Merge "Rename VcnUnderlyingNetworkPrioirty to VcnUnderlyingNetworkTemplate" am: 60ad179dff am: 6ca0ac41d5 am: 4b5fa75804

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

Change-Id: I78779e389ade547d656054e090faa442629fd5d3