Merge "Only restart the sleep state if SysUI was dozing" into tm-qpr-dev am: 751a07fb

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



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