[automerger skipped] Merge "Revert "[Setting] Cleanup Unused SimSettings"" am: 487c94c11a am: 74a7a3cfb2 am: 00d32abf06 -s ours
am skip reason: skipped by user pinyaoting

Change-Id: I6c18c5c6ac66ef428d0709a2045d83a4ed3a8c14