Merge "[Setting] Cleanup Unused SimSettings"
am: 64b5882f9e

Change-Id: I5dce0d25692dfb61e526eaf3d44dfab5b06bfe6a