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

Change-Id: I58672eccd38cae6eb2af2fae6ef57bdb432dc0e2