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: I2c8c086fb5f4a6c5618039908fed188522c864c5