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

* commit '6e957d6b42f8cc13e93d0ee7cfb97dea4f0c2b76':
  Always show pairing dialog for device-specific keyboard.