Merge "Fixes failing test after coroutine lib upgrade." into udc-qpr-dev am: b60c36e01d am: 5829f3ffd9

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

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