Merge "Revert "Require user pass in a non-null BluetoothDevice to all B...""