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

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



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