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 am: 2b57eaf8

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

Change-Id: I688641621444181c617477b79ec0da2ad4fe0194