Merge "Fixes failing test after coroutine lib upgrade." into main am: 2f9024fe

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



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