Revert "Fix APM race conditions in ServiceStateTracker"

This reverts commit 9b9286746ec909e7507600c5bb24e495ae88ce74.

Reason for revert: b/238373619, b/239265184
Bug: 239265184
Change-Id: I2a5adb619566feb427c0538fb36578f671d9980d
Merged-In: I101b015d1b6e5bd9cda497d302ee809985be70a9
(cherry picked from commit 0a6dbf646ffe97083d4a12746e0740ceec45c7a5)
Merged-In: I2a5adb619566feb427c0538fb36578f671d9980d
2 files changed