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: 3b8ff482 am: 41085a06" into rvc-qpr-dev-plus-aosp am: 1293a74d

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

Change-Id: I280969a8f36fb9fe4636daa0253cd10057942238