Merge "Store VcnControlPlaneConfig in VcnGatewayConnectionConfig" am: bf8113b93d am: 8f2b5071b3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3d0999c36c05c3bd8e0f6e561cb50cc018936189