Merge "Merge "Force status bar window to be visible when expanded" into...
Merge "Merge "Force status bar window to be visible when expanded" into nyc-dev am: 4b4e8145 am: e96abdba" into nyc-mr1-dev-plus-aosp
am: 88cba0b9
* commit '88cba0b9':
Change-Id: Ie901d3798fb4943ad418c457c53281f7d1717695