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

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

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



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