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

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

Change-Id: Ib5357da121de7ece186a6d8c295bb14d6e0079a0
Signed-off-by: Automerger Merge Worker <[email protected]>