am b8910783: Merge "Move TtyMode into its own ListPreference class." into lmp-mr1-dev

* commit 'b89107836b3cf3951d67069ae4d4ac92b15d7984':
  Move TtyMode into its own ListPreference class.