Merge "Fix notifications disappearing when shade fully expands." into tm-dev...

Merge "Fix notifications disappearing when shade fully expands." into tm-dev am: 1a4f7b8b am: 90177c70

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



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