Merge "Move connectSocket into IBluetoothSocketManager (3/3)" am: 8d742759cc am: 9c26701b35
am: 58de99a248  -s ours

Change-Id: I67655ed1c95c3e700a9ca8692ce68d7f468afcfa