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

[automerger skipped] Merge "Fixes failing test after coroutine lib upgrade." into udc-qpr-dev am: 58676dd3 am: 32d56938 -s ours

am skip reason: Merged-In If42e96e9ae29ae6e0585f6c2b567cca7b15d581e with SHA-1 2964de1d is already in history

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



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