[automerger skipped] Fix APM race conditions in ServiceStateTracker am: 9b928674 -s ours am: 5d313954 -s ours

am skip reason: Merged-In I1f5503d2420f6e8449adadc6bc4100a37f35251a with SHA-1 7e376251 is already in history

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



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