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

Change-Id: I8ce718a0322408565530840d5131998f03535159