Merge "Merge "Bluetooth: fix parameter name in onConnectionUpdated" am: 1f53eb76e4 am: 8ab1ed1789 am: dd71df9d41 am: 618ea49ccf"