Merge "Terminal shall display icon specified by DISPLAY TEXT command" am: 31056ddda0 am: 7f9a0643bb
am: 950d9b0c2e

Change-Id: Icb4cb892e2e4c2eff29392cdae0704688583bcd9