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 am: 7eb14082

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

Change-Id: Ie68ef8914784ab70caad754d1cc84ede035a338c