Merge "Revert "Revert "Enable LOCKSCREEN_WITHOUT_SECURE_LOCK_WHEN_DREAMING for...

Merge "Revert "Revert "Enable LOCKSCREEN_WITHOUT_SECURE_LOCK_WHEN_DREAMING for teamfood""" into udc-dev am: c991fc3c

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



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