Merge "Resolve message/conversation image Uris with the correct user id" into sc-dev am: 579df7d189 am: 27db525979

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

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