Merge "Revert "Revert "Require user pass in a non-null BluetoothDevice ..."" into rvc-dev am: 77864d6771

Change-Id: Id16e90dfbcd5bd9f639f8acadb589614b0075841