Merge "Fix crash when comparing messages" am: 42a3c415 am: ffa3b1c8 am: 8c08e338

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



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