[automerger skipped] Merge "Protecting Null Pointer Exception for Terminated...

[automerger skipped] Merge "Protecting Null Pointer Exception for Terminated IMS call." into tm-qpr-dev am: 8b373ce2 am: 080174ec -s ours

am skip reason: Merged-In I6dfcae478737b223576d5eb7310f87aa2c825401 with SHA-1 31dcaa81 is already in history

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



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