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

Merge "Merge "Merge "Track sent conversations better" into rvc-dev am: e59c7e46 am: ea4427b6" into rvc-d1-dev-plus-aosp am: fefd37a9" into rvc-qpr-dev-plus-aosp am: ecfd72b9

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

Change-Id: I9ef407bbfd6e623c2dfa8f740e88fdac7e3698be