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: Ic2e18d94a468207e1e73528bb35c3f78faa8afe2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>