Merge "Null pointer exception in SocketAcceptThread of BluetoothPbapService." into jb-mr2-dev