Merge "Merge "Make collapsed QS work the same as expanded" into nyc-dev am:...
Merge "Merge "Make collapsed QS work the same as expanded" into nyc-dev am: 09342402 am: afe5a367" into nyc-mr1-dev-plus-aosp
am: 9b8aaca1
* commit '9b8aaca1':
Change-Id: I7366c9fb307e8d32fa4f58c99e82895326947c48