Merge "Fix shouldControlUnlockedScreenOff." into tm-dev am: 8c13b43b85

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

Change-Id: Ie77598f84f31e8cdf850936fc9be01bbe30cac64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>