[automerger skipped] Merge "Do not crash when duplication found in merged imsi...

[automerger skipped] Merge "Do not crash when duplication found in merged imsi list" into tm-qpr-dev am: 46c7d694 -s ours am: 8b6e7bb6 -s ours

am skip reason: Merged-In I69d332ee0acde6cdd7582d1aa18c82576f7090f2 with SHA-1 fe5f1e99 is already in history

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



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