Merge "Revert "hal: Fix voice call routing issue on headset""