Merge "MessagingImageMessage: Don't crash if measured after recycle" into tm-dev am: ec3ee0a5c3 am: 387799ca13
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18577093 Change-Id: I953e688c335efa6514d443cf4798aa9e3f1f1efa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: