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 am: 4d268fef

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



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