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

Change-Id: I7866f15fb941570c0ae40b55624455e3cdc3170e