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 am: 723f68fa

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

Change-Id: I13e5ce9c73ac89f88f19f2b36a2108bfec58aa17