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

Merge "Do not crash when duplication found in merged imsi list" am: 0d7ec633 am: 350a4b3c am: 6b7cb8d2 am: 86b971c2 am: fd983cb7

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



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