[automerger skipped] Merge "Resolve message/conversation image Uris with the correct user id" into sc-dev am: 579df7d189 am: 27db525979 am: 63fc3a33b5 -s ours am: fc8e0c7aa2 -s ours

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

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

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