Merge "Don't check wakefulness before setting sandman summoned to false." am: d62c655f28 am: 7b13bb5c1b

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

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