[automerger skipped] Merge "Show one SIM only for EAP-SIM when dual SIMs have...

[automerger skipped] Merge "Show one SIM only for EAP-SIM when dual SIMs have the same carrier ID" into tm-qpr-dev am: 4a0bc2c3 am: bd13405d -s ours

am skip reason: Merged-In I56f956d20053d314f082ba185d661d8e0a0ef3cb with SHA-1 66922f48 is already in history

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



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