Merge "Fixed phone process crash in some rare conditions" into tm-qpr-dev am:...

Merge "Fixed phone process crash in some rare conditions" into tm-qpr-dev am: 77091437 am: 1dc60f1c

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



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