Merge "[automerger skipped] Merge "Allow forcing status bar state changes and...

Merge "[automerger skipped] Merge "Allow forcing status bar state changes and do so when the screen turns off." into qt-qpr1-dev am: cc70d98e -s ours am: 200306a7 -s ours am: fe0dd015 -s ours am: bc21b578 -s ours am: 482d3751 -s ours am: c704d2f8 -s ours" into sc-v2-dev-plus-aosp