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: f9fb3e4a am: d5af46be am: f5d189af

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



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