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

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



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