Merge "Bluetooth: Add handler parameter to connectGatt" am: 1f4e111808 am: 41eae807ef

am: 36ceeb548e

Change-Id: Icf0d3001d2ec25c7f5aad6c6789fdac1b58078bc

diff --cc api/current.txt
Simple merge

diff --cc api/system-current.txt
Simple merge

diff --cc api/test-current.txt
Simple merge

diff --cc core/java/android/bluetooth/BluetoothDevice.java
Simple merge

diff --cc core/java/android/bluetooth/BluetoothGatt.java
Simple merge