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

[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: 5637b4df -s ours am: ebfb03ea -s ours

am skip reason: Merged-In I79baeb71ac5d1ed45602ac55cdca996b3bed0ac3 with SHA-1 921d9558 is already in history

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

Change-Id: I013ca1882873fdc0c006287b88514203fef631b6