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

Change-Id: Id97645d7026466771a011ba787dce9866dc029d2