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

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

Change-Id: I90201e63b1dc171771246e789b4bfdebacf154b6