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

Change-Id: I378f55d65663a1628ca53c1e2a63b850aac94845