[automerger skipped] Merge "Don't convert conversation senders to the wrong...

[automerger skipped] Merge "Don't convert conversation senders to the wrong enum" into tm-qpr-dev am: b1d34981 am: 5c7b2aa9 -s ours am: 575d6d1b -s ours

am skip reason: Merged-In I7efb90982dbc8102552abd8244c0ec06fff6601e with SHA-1 0ce93167 is already in history

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



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