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

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

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

Change-Id: I37755d9fa913d359b423ad32a7b2b557ca2433ba