[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-dev am: e8cc6f06 am: cacb0cca -s ours

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

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



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