[automerger skipped] Resolve message/conversation image Uris with the correct user id am: a63ab761 -s ours am: 2075ea56 -s ours am: c1ed6151 -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: I5d0dfa4398ef6228ef72642f6d395f377100f54f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>