[automerger skipped] Merge "DO NOT MERGE: Associate notif cancels with notif posts" into rvc-qpr-dev am: d411e94a am: d16ab9b1 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3c583292f7df0dd4a7c4938519cb935fbfaa95e2