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 sc-dev am: 279ecc9d

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



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