Merge "Store VcnControlPlaneConfig in VcnGatewayConnectionConfig" am: bf8113b93d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1fedfbd2270ff5dac3e87e1ed83b0607a4ad2c30