Merge "Fix ConcurrentModificationException of getEmergencyNumberList" am: dbee5f7446

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I69a5bf9467a9dcf73bb24d5940870c3b5b6ad9b1