Merge "DrmHalTest: null check for skipped test" am: 51e1c2a42b

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2420339

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