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

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

Change-Id: Ic20884a16f3035a566d35d17361b1bb54d4e642a