Merge "Revert "[Setting] Cleanup Unused SimSettings""
am: 487c94c11a

Change-Id: I216047b915cbfb72eaf5de497709152fd8fee479