[automerger skipped] Merge "[Settings] Remove IMS factoryReset()" am: bf3aaf0f37 am: dc4e189dbc am: db65d2b0b2 -s ours
am skip reason: Change-Id Id5c868726189397fc2a85717326e56e055b640af with SHA-1 45d9f23fee is in history

Change-Id: Ia4f2777f541553bd0377c658b6bab392c0d86746