Merge "Fix notifications disappearing when shade fully expands." into tm-dev am: 1a4f7b8b am: da4c70fb am: 527d13ae am: a6cbd730

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



Change-Id: I1b17d3a8846523b27bb32fc1e1a95a6165f2550d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>