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

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

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