Merge "Remove delete action from notification" into rvc-qpr-dev am: e901be2678

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

Change-Id: Ib3a4a3935f0e23059c1d16336f860ca248b41edf