Merge "Revert "Fix problem with cell data service after SIM swap"" into...
Merge "Revert "Fix problem with cell data service after SIM swap"" into mnc-dr1.5-dev am: c220e7f6
am: f5d8153e
* commit 'f5d8153e':
Revert "Fix problem with cell data service after SIM swap"