Merge "Merge "Fix occasional bad placement of Conversation header" into...

Merge "Merge "Fix occasional bad placement of Conversation header" into rvc-dev am: c744ad24 am: fa9391fe" into rvc-d1-dev-plus-aosp am: 6eb60e29

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

Change-Id: I9414761f9ff9b8fdd540fa3b3f01b22b2bfadc43