Merge "[automerger skipped] Fix APM race conditions in ServiceStateTracker am:...

Merge "[automerger skipped] Fix APM race conditions in ServiceStateTracker am: 9b928674 am: f382644d -s ours" into tm-d1-dev-plus-aosp am: ff00b773 -s ours

am skip reason: Merged-In I1f5503d2420f6e8449adadc6bc4100a37f35251a with SHA-1 9b928674 is already in history

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



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