Merge "Skip VtsAidlHalDrmTargetTest if bootloader is unlocked" into main am: 70bc48df0f am: 578f14623c

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

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