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 am: 16c87265 -s ours

am skip reason: Merged-In I79baeb71ac5d1ed45602ac55cdca996b3bed0ac3 with SHA-1 55fc4a97 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16192213

Change-Id: I583ba81c972f494ce4e75fedb521d99c535d99d2