[automerger skipped] Merge "Allow forcing status bar state changes and do so when the screen turns off." into rvc-dev am: 6e7841799c am: bf5470d16c -s ours

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

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

Change-Id: I0db707b3ad18d775d05df160e1f32707dff75080