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: I2a0b17048b6d63994bb1865271f6012f5f6a1c89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>