Merge "Fixes failing test after coroutine lib upgrade." into udc-dev-plus-aosp am: d219d85f

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



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