[automerger skipped] DO NOT MERGE: Associate notif cancels with notif posts...

[automerger skipped] DO NOT MERGE: Associate notif cancels with notif posts am: 24a1d2c9 am: cc5d7fe3 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53b79901fb5a55bc160fa0d50d9fc96ca7f43218