[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-dev am: 0857f7e9 am: 69940bb0 -s ours am: 81f8087a -s ours am: 65daf3cf -s ours am: 57bf0524 -s ours

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

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



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