Merge "Revert "hal: Fix voice session setup failure""