[automerger skipped] Merge "Fix ConcurrentModification in onUidStateChanged"...

[automerger skipped] Merge "Fix ConcurrentModification in onUidStateChanged" into rvc-qpr-dev am: 46f8c13e am: bc7b2538 -s ours

am skip reason: Change-Id Ib4c96e81cbe2adcfd53ea23ae644e978effb7a92 with SHA-1 aad5f733 is in history

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

Change-Id: I2e1f034f26e6b188682d13e78d59802855255801