Merge "Fix potential NPE when MessagingMessage's message is null" am: 49d070c4e5 am: 4bb59e2c5c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2234268

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