To avoid having expanded notifications sticking around Bug: 16005498 Change-Id: Ib5b184fa7eb67ada85305e7ca4afad68a1514327