Merge "Merge "Bluetooth: fix connectGatt overload invocations" into oc-dev am: 556b10a4e6 am: 25278b0197" into oc-dr1-dev-plus-aosp