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

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

Change-Id: I398862c6ecf94fbd561063a2783f27d69b544ef9