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: 47a5a546 am: 3c43b10e

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



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