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

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

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