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