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: I88e754527305bab0b0ca51d58a2b1e9707366190
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>