Merge "Erase modem config on factoryReset"
am: 67a0df4484

Change-Id: Ib216113d5b8cb996513594809eec001a0d266264