Hltespr - fix data drops when receiving an incoming MMS
Merge remote-tracking branch 'upstream/cm-12.0' into cm-12.0