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