Merge "Fix crash prone code in BluetoothDeviceManager."