[automerger skipped] Merge "[Setting] Cleanup Unused SimSettings" am: 64b5882f9e
am: a9692bdf36
am: 14b406fd8f
-s ours
am skip reason: Change-Id I3f50e528eb409215371a125184502d3531bad0a8 with SHA-1 5cc9aad7a8
is in history
Change-Id: I259af559edd475f32b5c6c7b31538f289a9853b9
This commit is contained in: