Merge "Check NULL for Drm object" into tm-qpr-dev am: caff03cd2b

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

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