Merge "Merge "Compress hybrid conversation layout" into rvc-dev am: 444d74fa am: eb2df6d6 am: 425bbef1" into rvc-qpr-dev-plus-aosp am: 342c95f0

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

Change-Id: Ic925c3b043ba37866d0a9a573936983b48e8017e