Merge "Do not crash when duplication found in merged imsi list" am: ae267bae...

Merge "Do not crash when duplication found in merged imsi list" am: ae267bae am: 0da4abe1 am: 4beef2e8

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



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