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

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



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