Merge "Compress hybrid conversation layout" into rvc-dev am: 444d74fa39 am: 67afec2531

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

Change-Id: I6859755af47357e743d2698d6f8474aa6aa4cee3