Merge "Merge "Fixed a bug where notifications could reappear" into nyc-dev am:...
Merge "Merge "Fixed a bug where notifications could reappear" into nyc-dev am: 4226dcef am: c9c0bcf6 am: df8c8026 am: ee8d1394" into nyc-mr1-dev-plus-aosp
am: 0a502573
Change-Id: Ifb13e4fb6fd8290c7f8cbf505e45d64334d8b959