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: 143d674e" into rvc-qpr-dev-plus-aosp am: ebd055c0

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

Change-Id: I694fa4d418f01239948deb87e7b19e984dd37bdf