Merge "Fix a race condition in BT device handling" am: 691fe1da5d
am: d807b3f7e8

Change-Id: I7efa1f4834dd3183fc491da0203dc1c89ab1967c