[conflict] Merge "vts: fix some tunerhal vts fail without frontend device" into android11-tests-dev am: 6807799ad9

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

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