Merge "BluetoothGattCallbackExt removal"
am: e2ddacaff4

Change-Id: I59ba6c9950997ea447a5b021d509a72abc546661