[automerger skipped] Merge "Revert "Revert "Require user pass in a non-null BluetoothDevice ..."" am: 0d56f6c047 am: 1b50ff0d06 -s ours

am skip reason: Change-Id I91ee6878cac1b84bd289278a1b965658a26fe4db with SHA-1 e326572b74 is in history

Change-Id: I54737fcdc9408aaea9c02d3767ce7a68f26a942f