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 am: b35f1e62 am: d4466102

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



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