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