Merge "drm aidl vts: proper skip tests without vendor module" am: da4d0bcb15 am: 9cff591ab5

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

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