Merge "Avoid crash when the caller passes null message obj" into tm-dev am: 74a9c32a

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



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