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: 10c3c142

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

Change-Id: Id81e11fa84e84b80f5a147b7e656d6d522414145