[automerger skipped] switch SIM refactor to support MEP am: 59a6ecbd am:...

[automerger skipped] switch SIM refactor to support MEP am: 59a6ecbd am: b29d670c am: 0453d9de -s ours am: a5796165 -s ours

am skip reason: Merged-In Ief4299e775c0758e4b886d5eff13bd482f8c8ab3 with SHA-1 22ab05b4 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043025



Change-Id: I33345358d241c3f928c2acad799e74c8a7355532
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>