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

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

Change-Id: I1562bf706f7614da400bd5039b87b1bfac22507c