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

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

Change-Id: I58517a6774a1544fe0e4bea60cbd88681297a83a