Merge "Revert "Use display awake signal to replace screen-off signal for sleep...

Merge "Revert "Use display awake signal to replace screen-off signal for sleep token."" into sc-v2-dev am: 2328dee0 am: cda95b51

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

Change-Id: I397de8535578482e79ba3ee2d3a597d7c1bf0444