Merge "Don't remove bonding device from cached device list during inquiry" am: d5410ca5 am: ca4e402e am: 4fc59dcd Change-Id: I8cc54482e7c8e22c24c6d89a84dfef03dd7f120b