Merge "Fix occasional bad placement of Conversation header" into rvc-dev am: c744ad24 am: b7a44240 am: 2a225029

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

Change-Id: I8034d43ed38f78ba3e9e9ecbb0edad8a2d10deba