DO NOT MERGE: Associate notif cancels with notif posts am: d96f50a85f

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

Change-Id: Ic85570e58f06c1bd498fe1e0e0d5d636a58775d3