Merge "Check NULL for Drm object" am: 849320e814 am: 8b8a0a5f36

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

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