Add new $icons parameter to Echo hook:

* Update doc block
* Use names that indicate the variables are passed in, not used as globals.

Bug: 46585
Change-Id: I0f15498ab1fba239bce141b178340a9d9984bedf
Merge "Add new $icons parameter to Echo hook:"