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

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