Revert "Don't wait with mutator lock"

This reverts commit d2de05d5a441cb99b8c2ec1eb4ed0e9f4804fe7a.

Bug: 243086427

Reason for revert: Fails gtests and run-test

Change-Id: I7740cd971058ae01bdc62920ccc2098dbb5039ea
3 files changed