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

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



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