Merge "Allow forcing status bar state changes and do so during a cancelled...

Merge "Allow forcing status bar state changes and do so during a cancelled screen off." into sc-dev am: 87dc2763

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

Change-Id: I041043ddc1c771583e390b48925b334d912b28b5