Merge "hal: fix acdb data corruption when both voice and voip are active"