Merge "Revert "Change the routing path of bluetooth headset connections.""