Merge "hal: update haptics PCM ID"