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

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

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