[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: ea3594f9 -s ours am: 46743c9e -s ours am: cf8d46b8 -s ours am: b9a5d03f -s ours am: b79f2c67 -s ours

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

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

Change-Id: Idfb69d5adf9dfd2acc36f7695edd901f5eaf05e7