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 am: 7dd04655

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

Change-Id: Ifa7b533cbe44e1ddcc79be7a6df4b70315e7acc0