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

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

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