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

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

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

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