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

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

Change-Id: I05cc3f416cb9c363c306e9a73d4aceb381e0e1e3