Merge "Fix NPE in BluetoothPairingController when comparing BluetoothClass"