[automerger skipped] Merge "Fixes failing test after coroutine lib upgrade."...

[automerger skipped] Merge "Fixes failing test after coroutine lib upgrade." into main am: 2f9024fe am: 8b0a79b0 am: ebd85a4d am: de490180 -s ours am: f043a24e -s ours

am skip reason: Merged-In Ifdc470e3350e36f616ce89e2185e855389b7547d with SHA-1 ba4953a7 is already in history

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



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