Only discard the roaming icon if we're not roaming anymore.

  Ignore data roaming toggle because it shouldn't have impact on whether
  we show the indicator or not.

Change-Id: I445c1005a935eaca9d0a132d5a5a7fd214b300d0
(cherry picked from commit 682198e3)