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

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

Change-Id: I437f9d457f78cf2cb9b61cedf298e3e5adf354ae