[automerger skipped] Merge "Erase modem config on factoryReset" into qt-qpr1-dev am: fe3fb1417c -s ours
am: 39d1054eae -s ours
am skip reason: change_id I749302c9b98f5a519f4d76a054a003a26ec61326 with SHA1 8ff344d1cc is in history

Change-Id: I9543359fe2ef313b43068645592d7a9dbbbcb28d