tree e38daa92d762877477fef412484cf9e8d8ae2196
parent 0e92e711393537276819df56f10e9f3c090362cf
parent a9692bdf360b3fc0cd595e9a72a8da9588dbd34a
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576260319 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576260319 +0000

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

Change-Id: I58672eccd38cae6eb2af2fae6ef57bdb432dc0e2