[automerger skipped] Merge "refactor nvreset to rebootRadioModem and resetRadioModemConfig" am: fce8fb6173 am: 078f23cd92
am: efdb05a7d5  -s ours

Change-Id: Ib4d73c94d03e49b66327b585ed7094ff070ed549