Merge "Protect against NPE during RTT call sessions" am: 6e6efb17 am:...

Merge "Protect against NPE during RTT call sessions" am: 6e6efb17 am: 75c062d8 am: 1c0d3f2b am: 979843a4 am: 3b56661e

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



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