This change is necessary to unblock the upgrade of the
kotlinx.coroutines library.
Bug: 239834928
Test: manual -- all existing tests and builds should pass
Change-Id: I5a15d0c2c0ccf4c4fc3e8281a1f45add188275bd
Merged-In: I5a15d0c2c0ccf4c4fc3e8281a1f45add188275bd
(cherry picked from commit 4dca36f891)