Merge "Merge "Fix ConcurrentModificationException on finishing TaskFragment"...

Merge "Merge "Fix ConcurrentModificationException on finishing TaskFragment" into tm-dev am: 0d7ece81 am: 91b3e6b4" into tm-d1-dev-plus-aosp am: 10253421

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



Change-Id: I55b62472c9122262a3dd615476db318b531a98a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>