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: fed94f67 am: ed0d7014 am: bcf6f6b3

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



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