Revert "Workaround for b/336842546"

This reverts commit a4ac01044c50f4da02c40b8da5520d2eb65b41d9.

Bug: 336842546
Bug: 73760543

Reason for revert: Fix for the bug has been submitted. CL also has an issue with thread suspension.

Change-Id: I06785d58f3e473a13e18876e481fff9118851f53
7 files changed