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

Change-Id: I02216936cd583e0a9a015287decdcb9f849ca45c