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

Change-Id: Id25f495acb6864b1416a2730b5396be99105e43d