[automerger skipped] Merge "DO NOT MERGE Notifs sent from suspended apps...
[automerger skipped] Merge "DO NOT MERGE Notifs sent from suspended apps should reappear" into pi-dev am: 0b89c36e
am: 497bb68f -s ours
Change-Id: Iab93a7ec7f500794dd4e936f4265ba9b9afa81a1