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

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

Change-Id: I61efb54acb11cf028a067e0a6e916a146116182e