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

Change-Id: Iff52b045deeb3e1c4a2af044042c74c7ae7646f0