Merge "Enable LOCKSCREEN_WITHOUT_SECURE_LOCK_WHEN_DREAMING for teamfood Test: Device Tested Bug: b/275694445" into udc-dev am: b0f81d298c

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

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