Merge "Merge "Bluetooth: fix connectGatt overload invocations" am: 404e9f20 am: c0fed83b am: 3b852973 am: fcc30a6d"