[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: b22f5489 -s ours am: ff242905 -s ours am: d3d37574 -s ours

am skip reason: skipped by user hgchen

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



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