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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d891d8abc612df1fa2003ad946b98b9d22088aa