Merge "Don't remove bonding device from cached device list during inquiry" am: d5410ca51b
am: ca4e402e9b

Change-Id: Ieac7271cf0d1aaa75f3472685e745b55e006ba67