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: 95c2e347
* commit '95c2e347':
Change-Id: Id392b43b9ef617c5a605570b7a4dd94f5a7f5351