Merge "API: Expose VcnControlPlaneConfig" am: bf16b6d399 am: 7cccd926a9 am: 6bbb6b7751

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a759a0d34efb81998d9dfb070a59eefbab642c0