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

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

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