[automerger skipped] Merge "Atom: Add BluetoothSocketConnectionStateChanged" am: 502900a093 am: 7abb3185eb
am: c3a29ed5dd -s ours
am skip reason: change_id I97b1e650e197a0dad1e2959e2f5b4dd98370d892 with SHA1 815cdbaae0 is in history

Change-Id: Ia60a704a6bc453d95aef0b125270fc6e679788d7