[automerger skipped] Merge "Fix ConcurrentModificationException of...

[automerger skipped] Merge "Fix ConcurrentModificationException of getEmergencyNumberList" am: dbee5f74 am: 7a9c93d3 am: 9bcf079a -s ours

am skip reason: Change-Id I5812469dfb96f30b5b185fc1bb983e3357bb4efa with SHA-1 f4ded970 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic147a04aec1667b1479a9b467e2ef40db623761e