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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic5a5bab3e6788c7483b148aceaa4087cec09ad37