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

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

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