[automerger skipped] Merge "Fix Notification redaction when power cycling a...

[automerger skipped] Merge "Fix Notification redaction when power cycling a non-dozing device while occluded." into sc-dev am: 279ecc9d am: 71227bd6 -s ours am: e2652afc -s ours am: ff2bdc1f -s ours am: ce5fa24c -s ours am: 66166fbd -s ours

am skip reason: Merged-In I95443ee6b77377aceb54b983d34131628027da9b with SHA-1 09d333e0 is already in history

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



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