Merge "Fix falsing on notification dismissal." into tm-qpr-dev am: b2cd3164

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



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