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

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

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