Merge "Don't return true for controlling screen off once we've already...

Merge "Don't return true for controlling screen off once we've already returned false for this sleep." into sc-dev am: 703c8d30 am: 4d71f694 am: c26e3979

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

Change-Id: Ifd9535365c45106b4f45ba3ebf9b6a26b7540731