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

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



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