[automerger skipped] Merge "Atom: Update BluetoothConnectionStateChanged atom" am: 1ff7bdb095 am: 93c60d8e14
am: 50b90a031d -s ours
am skip reason: change_id I5398e4caae751e1fe1d6a95fa3bc56d062eb6172 with SHA1 d9837c8a9e is in history

Change-Id: Ic26cca35e6731d2ce207825c91dfbb6d73d81911