Merge "Fixes failing test after coroutine lib upgrade." into udc-qpr-dev am: 58676dd3

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



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