am 629a9a0b: am 6709fba9: Merge "SysUI: Reset ExpandableNotiRow.mActualHeight on reset()" into lmp-mr1-dev

* commit '629a9a0b392026169287fde5d168593fa228ec55':
  SysUI: Reset ExpandableNotiRow.mActualHeight on reset()