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 am: bde9e6a4

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



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