Merge "Don't convert conversation senders to the wrong enum" into udc-dev am:...

Merge "Don't convert conversation senders to the wrong enum" into udc-dev am: 1244eb67 am: ca349a75

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



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