[automerger skipped] Merge "refactor resetNv API to resetRadioConfig and rebootRadio" am: e459133141 am: d565e3168e
am: 35d377e27d  -s ours

Change-Id: I08a94ce62e4dfe6de29a6e8e062a19917477577b