Fixed a bug where notifications could stay expanded am: b2236108ae
am: 97f14c47db  -s ours

Change-Id: I8871b9f79245de04271894a6e2e508b1c55280de