[automerger skipped] Merge "Fixes failing test after coroutine lib upgrade."...

[automerger skipped] Merge "Fixes failing test after coroutine lib upgrade." into udc-dev-plus-aosp am: d219d85f am: 814fe9ec -s ours

am skip reason: Merged-In If42e96e9ae29ae6e0585f6c2b567cca7b15d581e with SHA-1 4dd64f36 is already in history

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



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