[automerger skipped] Merge "Provide more specific notification cancelation...

[automerger skipped] Merge "Provide more specific notification cancelation reasons" into sc-dev am: b7eee43f -s ours

am skip reason: skip tag Change-Id I836b6632007224381a181add54e3c36a39466d4b with SHA-1 81b4a6c7 is already in history

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

Change-Id: I2b73d42bd31bf90242ef9d5af2ba388a122e0481