Merge "Revert "Revert "Require user pass in a non-null BluetoothDevice ..."" into rvc-dev am: 77864d67 am: 11aa05b0 Change-Id: I2dbd2e373830bd78e769be55682d2a509fc72a47