[automerger skipped] DO NOT MERGE: Associate notif cancels with notif posts am: d96f50a85f am: b5ee553888 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2ffc823bc983493b30d35905840e37a840e5d03f