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

Change-Id: I5b560a7ff1036068c58e0bb0da1e43c0f7c56106