tree bc7736469ef7446a82c4b8e617f497d719cebabb
parent b35581d9240663c51450ecd569e9da44cef4b15a
parent f2856077a0322883c1dae22837fe58991e35f8fa
author Steve Elliott <steell@google.com> 1592237473 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592237473 +0000

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