Merge "Disable unlocked screen off if the display needs blanking." into sc-dev...

Merge "Disable unlocked screen off if the display needs blanking." into sc-dev am: 15e77132 am: 0d777c06

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

Change-Id: I2e128b735926c660e18f4c4f46eff0a6903c6ae5