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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I849201445a8c6c9b537887939298d5331035e330