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

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

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