[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 am: 6470312f -s ours am: f5394eeb -s ours am: a81f4cdf -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: I24efd94ff7a6938d3de4ca222b794c7b2ce77904
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>