Merge "[automerger skipped] Merge "Add a null pointer check to the VcnConfig"...

Merge "[automerger skipped] Merge "Add a null pointer check to the VcnConfig" into udc-dev am: e7f818af am: 6470312f am: f243c04e -s ours" into udc-qpr-dev-plus-aosp am: c88fd4d1 -s ours

am skip reason: Merged-In I0cbab6e38f68d8c669db2ddb324b013baa93204a with SHA-1 feab41aa is already in history

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



Change-Id: If82b3ac70b5b7046046208e721ec85bd2c867483
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>