[automerger skipped] Merge "Don't trust DozeState onScreenState changes" into...

[automerger skipped] Merge "Don't trust DozeState onScreenState changes" into rvc-qpr-dev am: 697711df am: 4a6b0e0e -s ours

am skip reason: Change-Id Ie32f91c5a46bd987649a8a17e6543071847ad97c with SHA-1 a3c5a6a5 is in history

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

Change-Id: Ia257f4f6472e7f63869c1efa36e946720117e6e0