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

Change-Id: Ibef0191ee1863e08ab73226d9e27cbdfa54face2