Merge "Fix ConcurrentModificationException of getEmergencyNumberList" am: dbee5f7446 am: 7a9c93d3d2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I716654b640cd3366452dcdd8a82a21da001a273e