[automerger skipped] Merge "Filter conversation list by current users" into...

[automerger skipped] Merge "Filter conversation list by current users" into rvc-qpr-dev am: 9bf2c7aa am: 3189599a -s ours

am skip reason: Change-Id I31bfc8d1045776884676d397be03298ebe2190c3 with SHA-1 0e683cd1 is in history

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

Change-Id: I0dacb4fd6fb3b6f269ac6ae514c152e8dd6c98e6