am 950a3c01: am 51519521: Merge "Add tty defaults to bionic"

* commit '950a3c010cfbb18bb5974a78040ab9946370e553':
  Add tty defaults to bionic