Merge "Fix APM race conditions in ServiceStateTracker" into tm-d1-dev am: abeaa6e8 am: 78f8352f

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



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