[automerger skipped] Merge "Remove deadlock/lock contention on Incremental progress update." into sc-dev am: b0ccf647 -s ours

am skip reason: skip tag Change-Id I6120443a03ec22d1ca672e5a1acf8b3752e1c3ee with SHA-1 c9e4cf30 is already in history

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

Change-Id: I6061c955b53fb388c586c9050311821a13313030