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

Change-Id: I56c8a7b23e97bf13e44faedd9a3aac898f3c11e9