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

Change-Id: I871bc30dcd7aeb5c4a6f6c15d84b43dee84994f2