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

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

Change-Id: I276f3ebea7eed76cd1e194276ff6dc085bc1e13f