Merge "[Settings] Remove IMS factoryReset()" am: bf3aaf0f37 am: dc4e189dbc

Change-Id: I019d3a5df41512a142a4745b4d56a53b73a05c60