Merge change 2969

* changes:
  Implement and expose SCO socket support in BluetoothSocket.java.