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: da4c70fb am: 527d13ae

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



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