Merge "Revert "Revert "Require user pass in a non-null BluetoothDevice ..."" into rvc-dev am: 77864d67 am: 0d3c3b96 Change-Id: I475dea2232929e2187f9e2f75d6198cd7a5f5a1b