Merge "Enable LOCKSCREEN_WITHOUT_SECURE_LOCK_WHEN_DREAMING for teamfood Test:...

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

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



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