[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 rvc-dev am: 6e784179 am: bf5470d1 -s ours am: 53f3093d -s ours am: e01209d9 -s ours am: a38215eb -s ours

am skip reason: Merged-In I79baeb71ac5d1ed45602ac55cdca996b3bed0ac3 with SHA-1 9be62075 is already in history

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

Change-Id: Ibaac6760899d16e580cd74befdcc16ef3d91276f