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

This reverts commit ab4f831229ea368def923521373febdee1ab7dd1.

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
2 files changed
tree: d939f5c77c7d90baf3e4332c35b2584c437f1ffd
  1. core/
  2. services/
  3. tests/