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

Change-Id: I5e0fff8fb5e27a6ac6a3ff399ad327477dda0822