Merge "Merge "Fix notifications disappearing when shade fully expands." into tm-dev am: 1a4f7b8b am: da4c70fb" into tm-d1-dev-plus-aosp am: dbad0f69 am: 1e5d3d73

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



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