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: a74ddcdf

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

Change-Id: I9cc7d382d07a57468a1296af38c79d7dce6a4bfd