Merge "hal: update voice2 pcm device id for APQ target"