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

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

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



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