Merge "Fix NPE when accessing mCallback in BluetoothGatt"
am: 1be8fb23eb

Change-Id: I764b7a169e5acabef07fafc43367040d8d493d7b