[automerger skipped] Fix for BluetoothGattCallback.onConnectionStateChange...
[automerger skipped] Fix for BluetoothGattCallback.onConnectionStateChange being called more than once
am: b9492b5c -s ours
am skip reason: change_id Id94db9429e31224ef35eb2c99c0f9a65e7c27d32 with SHA1 ebad0c65 is in history
Change-Id: Ic916951801b2e1b973d2fe7a65b05282714f93da