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

[automerger skipped] Resolve message/conversation image Uris with the correct user id am: a63ab761 -s ours

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

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



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