DO NOT MERGE: Cherrypick I90d95644: Fix bogus "data disconnected due to roaming" notification

Cherry-pick change I90d95644
<https://android-git.corp.google.com/g/153144> into ics-mr0.

(Ed and Justin have already cherry-picked this change directly into
ics-mr0-release, so here's the same change for ics-mr0 to keep it in
sync.)

Bug: 5632572
Change-Id: I31418d851907a752505d8ed0babf5712d16beabc