[automerger skipped] Merge "Revert "Revert "Require user pass in a non-null...

[automerger skipped] Merge "Revert "Revert "Require user pass in a non-null BluetoothDevice ..."" into rvc-dev am: 77864d67 am: 11aa05b0 am: 479fb8a2 am: 30cb7713 -s ours am: 677798df -s ours
am skip reason: Change-Id I4d7d971af75bff8967fd807d34dad90c32e24eba with SHA-1 35bc5b5b is in history

Change-Id: Ie91a074856075bb9d93be76576695a43169c7b7f