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