am acd01ff0: Merge "Keep deleteIntent when copying Notification attributes"

* commit 'acd01ff07668a608cb4890a2ea1533a2397149c8':
  Keep deleteIntent when copying Notification attributes