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

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

Change-Id: I34fe2a4803ae062a5f294597a6bead35f86a37a9