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: 71227bd6 -s ours am: e2652afc -s ours am: 7dce68af -s ours" into tm-d1-dev-plus-aosp am: 14b196e8 -s ours am: 2467bf63 -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: Iea9c2d47420e6a8fd4f7d409150f99a62471ba66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>