Revert "Addressing comments for http://ag/7700679."

This reverts commit 8031acad0e8059020df23a8258b7c2e0ab2bbd8b.

Reason for revert: This change has been implicated in 4-way deadlocks as seen in b/134244752.

Bug: 134244752
Change-Id: I5fbb3443a39a21fc9d96442726cd10d20e8d61cd
2 files changed
tree: 9ff81449fa2fcf83dcd7450c78f874ace8e0a73e
  1. core/
  2. services/
  3. tests/