Merge "Don't check wakefulness before setting sandman summoned to false." into...

Merge "Don't check wakefulness before setting sandman summoned to false." into tm-qpr-dev am: 35512533

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



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