[automerger skipped] [conflict] Merge "vts: fix some tunerhal vts fail without...

[automerger skipped] [conflict] Merge "vts: fix some tunerhal vts fail without frontend device" into android11-tests-dev am: 6807799a am: 88b7c10c -s ours

am skip reason: skipped by user hgchen

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



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