Merge "Merge "Collapse QS panel after details if we expanded it before" into...
Merge "Merge "Collapse QS panel after details if we expanded it before" into nyc-dev am: 6dde42f0 am: 410a288b" into nyc-mr1-dev-plus-aosp
am: 56f05e8c
* commit '56f05e8c':
Change-Id: I0e0b53b688f7bff7874f188d091c4d2455524169