Merge "hal: add incall music uplink2 pcm id"