tree 6953a75df38d2ed42ae49a7d89a596353ebcc910
parent 2b2c3e67246a41e1d447ca700e4b4312c617d38a
parent 559fd17ee92bcd0679764190b53b2b795555d6de
author Yan Yan <evitayan@google.com> 1613601026 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613601026 +0000

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