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

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