[automerger skipped] Merge "Fix Notification redaction when power cycling a non-dozing device while occluded." into sc-dev am: 279ecc9dc1 am: 71227bd648 -s ours am: e2652afc6f -s ours

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

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

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