Revert "Reduce lock contention in ContextImpl"

This reverts commit 8da0f1e25c3a5703f908a82a51a3e2f8021c08b6.

Reason for revert: Based on local testing, this is responsible for b/329240768

Change-Id: I58910653bea4a024f2e5d1feaf47f93b8b9df534
1 file changed