Merge "Merge "Collapse QS panel after details if we expanded it before" into nyc-dev am: 6dde42f am: 10b21ec" into nyc-mr1-dev-plus-aosp
am: e573448

* commit 'e573448ca922ce063319ae0dd20b6a80b88fa9de':
  Collapse QS panel after details if we expanded it before

Change-Id: I85c99ef1b4dabfa970b866d0e307beab726db60e