Merge "QS Header: remove collapsed alarm ripple" into nyc-dev
am: 5df0ee53ac

* commit '5df0ee53acc90e174f59be6c3c0fe52fd778a66e':
  QS Header: remove collapsed alarm ripple

Change-Id: Ic26aef478324ff0a579b73ba901ed8798d814f7d