[automerger skipped] Merge "Remove delete action from notification" into...

[automerger skipped] Merge "Remove delete action from notification" into rvc-qpr-dev am: e901be26 am: ab7a9091 -s ours

am skip reason: Change-Id I1c6046a84d15719c5bad8a840037fa08be05fe65 with SHA-1 1700fdca is in history

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

Change-Id: Id16bef2ebc564605a340a14084ed4b15b3c0f464