[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: 0d3c3b96 am: bf5f5339 am: b23e103a -s ours
am skip reason: Change-Id I4d7d971af75bff8967fd807d34dad90c32e24eba with SHA-1 7fc95c6d is in history

Change-Id: Idca99e9ca4b5b99c1842dfcbed67e3dd5f47d689