Merge "Fix concurrent modify exception for A11y" am: 2dcd402cdc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie98305d5930ee7426bb8169d8f4a70d76e5383f6