Merge "DO NOT MERGE Notifs sent from suspended apps should reappear" into pi-dev
am: 0b89c36e8a

Change-Id: Ibe257d2d0e6fd40b44483c9fa69389d5bd9822af