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

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



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