Merge "hal: Update the correct channel count for dolby configuration"