[rilmodem/gprs] Back out previous optimization, as it causes breakage.
[rilmodem/gprs] Merge nemomobile GPRS changes.