Merge "Bluetooth: fix connectGatt overload invocations" am: 404e9f209f am: c0fed83b84
am: 3b852973e3

Change-Id: I1c037d2461bb5c82ff405a507c9fce60b5902368