Merge "Merge "Adjust conversation layout paddings to match UX spec" into...

Merge "Merge "Adjust conversation layout paddings to match UX spec" into rvc-dev am: acea7d39 am: 7aa4e3e9" into rvc-d1-dev-plus-aosp am: a26988d5 am: 2fd5b774

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

Change-Id: Ibb67da1ef3748dfb0fd5f1258c31f6b050cab15f