Merge "Fix Bluetooth OOB pairing not working for unseen devices"
am: 3ef0315eb7

Change-Id: I05f7aaf1f0bdbffb6ef21e9250631633debb6b8b