Merge "Terminal shall display icon specified by DISPLAY TEXT command"
am: 31056ddda0

Change-Id: I397d377581fba46f9cb881a23a488e8ec5bcb863