[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 -s ours am: 1b1b3e0c -s ours am: 9e19ba32 -s ours
am skip reason: Change-Id I4d7d971af75bff8967fd807d34dad90c32e24eba with SHA-1 35bc5b5b is in history

Change-Id: I6037c18a501f2ad7fed0b6803ba89b0cb4062489