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

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

Change-Id: I15f6476224f42f2c1b703ae37b272cb30fc212f3