Merge "Do not crash when duplication found in merged imsi list" am: 0d7ec633

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2198759



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