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: bf435b1f
* commit 'bf435b1f':
Change-Id: Iffcf55c6e13a6a3158595063e220f7e8190aa9bf