Revert "Revert "Fix for data and roaming icons""

This reverts commit cc91bddcb11b3a3f0b315356707fbdc086e6cb74.

This is breaking 1x data on d2vzw and jfltevzw.

Change-Id: I6a0db457b5655d7065b68f403394b3c3feffa05f
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2