Merge "Don't convert conversation senders to the wrong enum" into tm-qpr-dev am: b1d34981

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



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