[DO NOT MERGE] Revert "[DO NOT MERGE] Use new QueuedWork interface."

This reverts commit 81758edffae751c31fb1795febe470c171f7fb1b.

Bug: 30662828
Change-Id: I5c877a3a888f075afcfb9f49ec92cf3ad43f6304
2 files changed