[automerger skipped] switch SIM refactor to support MEP am: 37358798bc am: 483ff27a47 am: 57fbdab22d -s ours am: 7ae4b284b0 -s ours
am skip reason: Merged-In I8580022793e5c3fc14159f14b406f864353477f8 with SHA-1 1e0e9021ac is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043024
Change-Id: I29e24837dcafa6027bae17905ad0392e89ffbecb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: