Merge "Fix Notification redaction when power cycling a non-dozing device while...

Merge "Fix Notification redaction when power cycling a non-dozing device while occluded." into tm-dev am: 64b630c5

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



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