Merge "Fix Bluetooth OOB pairing not working for unseen devices" am: 3ef0315e am: bd1a923c am: 08109a61 am: 414c77ce Change-Id: I4a694e543037263cfa80b2cf5473acfee9d007c0