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

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

Change-Id: I37b88a8d0086caf0cd3bb9a376b25cac4a8146c4