Merge "refactor resetNv API to resetRadioConfig and rebootRadio" am: e459133141
am: d565e3168e

Change-Id: I8e41afef66a16cc89a7f306711343f56a8995c19