Merge "Add checks where fetching vdm could cause NPE" into udc-dev am: 4682a93c am: edf8c3d4

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



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