Virgin Mobile (MNC07) considered non-roaming on Movistar (MNC02)

Change-Id: I46a782aefbe62295d6ce9d3c15a2e25630bdcacc
Merge "Virgin Mobile (MNC07) considered non-roaming on Movistar (MNC02)" into kitkat
Merge remote branch 'aokp/kitkat' into kitkat