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

Merge "[automerger skipped] Merge "Fix Notification redaction when power cycling a non-dozing device while occluded." into sc-dev am: 279ecc9d am: 37dc894a am: 2bbb7a41 -s ours am: b00db46a -s ours am: d1ec93b9 -s ours" into tm-d1-dev-plus-aosp am: 181f1fef -s ours am: d7c351ee -s ours

am skip reason: Merged-In I95443ee6b77377aceb54b983d34131628027da9b with SHA-1 9d20909e is already in history

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



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