Merge "Revert "Fix APM race conditions in ServiceStateTracker"" into tm-d1-dev...

Merge "Revert "Fix APM race conditions in ServiceStateTracker"" into tm-d1-dev am: 1a7d2609 am: afe3c56a am: b04bdac8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/19300569



Change-Id: I72f4f0ef348407b90c15fe7e3e1a72081a074d05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>