Merge "Add a null pointer check to the VcnConfig" into udc-dev am: e7f818af am: 6470312f

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



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