Revert "[Setting] Cleanup Unused SimSettings"

This reverts commit 0d9d341932166b46634bcd7e53af910b4c68b844.

Reason for revert: Potential culprit for b/146229292 - verifying through Forrest before revert submission

Change-Id: I29a3ed1a44ea324e0fa88cda2e5baecb441f7922
6 files changed