Merge "Compress hybrid conversation layout" into rvc-dev am: 444d74fa am:...

Merge "Compress hybrid conversation layout" into rvc-dev am: 444d74fa am: 67afec25 am: d966f25c

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

Change-Id: I57baead21dcb364f19797717e2f15a41f4f3015b