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

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

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