Merge "Bluetooth: Check for both SCO and ESCO types in hci_connect API." into msm-3.4