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

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

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