[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 tm-dev am: 64b630c5 am: 530bbf8d -s ours am: 4a332f20 -s ours am: 96e9d029 -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/+/19416132



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