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

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

Change-Id: Ibd1819f5787124429da6042e402043e2cacb693e