Merge "BluetoothGattCallbackExt removal" am: e2ddacaff4 am: 2a32d04a24
am: 822ddff283

Change-Id: I2bffe270bde8eecd2673b75fbd578f833b59f402