Merge "Fix ConcurrentModification in onUidStateChanged" into rvc-qpr-dev am: 46f8c13e5b

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

Change-Id: Iebf8e0aa1ddcbc8cb76cff97a6b2700cec2b76c7