Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket"