DO NOT MERGE: Associate notif cancels with notif posts am: 24a1d2c990

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia1e59e74decf4453eb0489bbc7139032b9e0387c