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

[automerger skipped] Merge "Resolve message/conversation image Uris with the correct user id" into tm-qpr-dev am: 923bcfc4 -s ours am: ba9d4443 -s ours

am skip reason: Merged-In I11c5b39f2d9d8f0788acab43640a6d4abcd5a179 with SHA-1 44524f06 is already in history

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



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