Merge "DO NOT MERGE: Associate notif cancels with notif posts" into rvc-qpr-dev am: d411e94a

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

Change-Id: I66aa98a0801210094c641a1645bebf0d517343f9