Merge "Fix occasional bad placement of Conversation header" into rvc-dev am: c744ad246e am: b7a442409d am: 2a2250298e

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

Change-Id: I8034d43ed38f78ba3e9e9ecbb0edad8a2d10deba