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

Change-Id: I4a694e543037263cfa80b2cf5473acfee9d007c0