Merge "Move BluetoothSocketManager to java"
am: 89818d6da8

Change-Id: Ice81b1972dfa10687c9ef6567b0d15596e6951bf