[automerger skipped] switch SIM refactor to support MEP am: 59a6ecbde2
am: b29d670c71
am: 0453d9de8d
-s ours am: a579616596
-s ours am: 695fef0c00
-s ours
am skip reason: Merged-In Ief4299e775c0758e4b886d5eff13bd482f8c8ab3 with SHA-1 22ab05b420
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043025
Change-Id: Iccb0814e00395600fc7766f63ddc302bad47cec9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: