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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I349d2f7e4c6bbeb28e0cd79be1ed5b6480558144