Merge "Don't trust DozeState onScreenState changes" into rvc-qpr-dev am: 697711df74

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

Change-Id: Ic67de8dd079cd4590057811ba33c309c343dfbc3