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

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



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