Merge "Change the use of ScreenLifecycle to WakefulnessLifecycle." into tm-qpr-dev am: 83623aaa8e am: 89e911fca9 am: 4b34b7075c am: 905aca09bc

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

Change-Id: I41da0038fcab9be54b9a88994c67623295e51c04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>