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: e5d675e5 am: 55c9b5c7

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



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