Merge "Merge "Fix text / convo icon overlap in RTL" into rvc-dev am:...

Merge "Merge "Fix text / convo icon overlap in RTL" into rvc-dev am: 665670e0 am: 8d838180 am: 1a50efa2" into rvc-qpr-dev-plus-aosp am: 5adf3790

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

Change-Id: Ib8cc412c2733fae4e1e58fb42b3010118e66b83a