Merge "Fix missing notifs after swipe" into tm-qpr-dev am: 61d96df6

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



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