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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id80754eb08e878e16e1e1f9b738c0baf749d23aa