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

[automerger skipped] Merge "Add a null pointer check to the VcnConfig" into udc-dev am: e7f818af -s ours am: f4b49bfd -s ours am: 5c731341 -s ours am: 53e1cf66 -s ours

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

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



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