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

Merge "[automerger skipped] DO NOT MERGE: Associate notif cancels with notif posts am: 24a1d2c9 am: bc878b6a am: 5eea1f90 -s ours" into sc-dev am: 81084745 -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: I7e60f7dda0675303f235570d9b088c2d132ee98d