This reverts commit e13b3791a0. Reason for revert: This change has been implicated in 4-way deadlocks as seen in b/134244752. Bug: 134244752 Change-Id: I87ddc0af9ff6fbd9b7afd6d4d24985b9b7205416 Merged-In: I64b48d575f2e6ec4cb7d2d100a859a30af0501dc
e13b3791a0