Merge "Resolve message/conversation image Uris with the correct user id" into udc-dev am: e8cc6f0694

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

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