GitLab

For userdebug and eng builds, turn on the text display automatically
if no command is specified.

(cherry-pick of 785d22c8.)

Bug: http://b/17489952
Change-Id: I38377c45f2a8e45ca788e5506695aa88c769cbcf