Merge "refactor nvreset to rebootRadioModem and resetRadioModemConfig" am: fce8fb6173
am: 078f23cd92

Change-Id: I0ff531b73774ff84d2470485fdae6f5c0a5ab8ef