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

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

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



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