Merge "hal: update QCHAT pcm device ID"