[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: 544b3a5f -s ours am: 0b2823df -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: Ie95458234566df5a7adb1bcc99e87876c4adb37a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>