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

Change-Id: I17a1794b8ead9faebb380c8866b76b788895a0f4