[automerger skipped] Merge "Resolve message/conversation image Uris with the...

[automerger skipped] Merge "Resolve message/conversation image Uris with the correct user id" into udc-qpr-dev am: aa0cfb5b -s ours

am skip reason: Merged-In I11c5b39f2d9d8f0788acab43640a6d4abcd5a179 with SHA-1 a67952e2 is already in history

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



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