Merge "Fix issue where notifications remained hidden on lock screen after two...

Merge "Fix issue where notifications remained hidden on lock screen after two quick power presses." into sc-dev am: bc35078c am: 774cae5f

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

Change-Id: I1aa7e9afbd747f8e77ec37e69fbc4829eb99911d