Merge "LockSettingsService: fix UnlockedDeviceRequired to work without LSKF" into main am: e4dc159215 am: b8b1e09c64

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

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