Merge "Merge "Track sent conversations better" into rvc-dev am: e59c7e46 am:...

Merge "Merge "Track sent conversations better" into rvc-dev am: e59c7e46 am: ea4427b6 am: 4a94462d" into rvc-qpr-dev-plus-aosp am: 9997b07e

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

Change-Id: If19d8bf222c9784e40198f3bad5e297c8ed5c1e3