Merge "MessagingImageMessage: Don't crash if measured after recycle" into...

Merge "MessagingImageMessage: Don't crash if measured after recycle" into tm-dev am: ec3ee0a5 am: 646ae222 am: 37b8f184

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



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