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

* commit '47a5cb122ab495e8420c46d8f324bddcd38920af':
  Keep deleteIntent when copying Notification attributes