Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev am: 66b6591d4c am: 6e957d6b42
am: 94a5587ed6

* commit '94a5587ed664fa2e3996534d9ccf41394a1f131e':
  Always show pairing dialog for device-specific keyboard.