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

* commit '66b6591d4c14400a18573a11880db16bb26ab80a':
  Always show pairing dialog for device-specific keyboard.