Merge "Collapse Notification panel after tapping CLEAR ALL button" am: ca8b270063
am: d4b6e59cad

Change-Id: Ib6f48bc7bf8f6cfae5f66adcdd7923891c320f99