Merge "Fix Notification redaction when power cycling a non-dozing device while...

Merge "Fix Notification redaction when power cycling a non-dozing device while occluded." into tm-qpr-dev am: 64f07c00 am: d7df87e6

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



Change-Id: I3d7964b9b97ae5b7d27443ad26f371f32837b0bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>