Merge "Fix crash when comparing messages" am: 42a3c415d7 am: ffa3b1c83c

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

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