Revert "Revert "Revert "[RC] Port Add Wifi name to notification drawer (2/2)"""

This reverts commit 4b1b0d629619537d3b4769de0348bd1ab0c9d1f6.

Change-Id: I7d2bad52488c7eac2787eabb6300e20d6e3dc419
Merge "Revert "Revert "Revert "[RC] Port Add Wifi name to notification drawer (2/2)"""" into jb-mr2