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 am: 67401af3

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



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