Merge "API: Expose VcnControlPlaneConfig" am: bf16b6d399

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2cb2e3adc988cbdb97d771b45eda9fdecf2b6383