[automerger skipped] Merge "Erase modem config on factoryReset" am: 67a0df4484 am: 98a869421a
am: 6b3c850edf -s ours
am skip reason: change_id I749302c9b98f5a519f4d76a054a003a26ec61326 with SHA1 d63128dc1a is in history

Change-Id: I061df6eb44e499e0f070b3850dbe036e1a9c4095