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

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

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