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

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

Change-Id: Ie22c4b910ff909a7b2f2518fe0618f927b490628