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: 8661d451 am: a59fdb82

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

Change-Id: I250d89a9b9408b16e2069f96f9a002503893c473