[automerger skipped] Merge "Resolve message/conversation image Uris with the...

[automerger skipped] Merge "Resolve message/conversation image Uris with the correct user id" into sc-dev am: 579df7d1 am: 27db5259 am: 63fc3a33 -s ours am: fc8e0c7a -s ours am: eff2f722 -s ours am: 1aed8c17 -s ours

am skip reason: Merged-In I11c5b39f2d9d8f0788acab43640a6d4abcd5a179 with SHA-1 83975c51 is already in history

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



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