Merge "hal:qap-test: fix for dts/dolby use cases in qap path"