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 am: 5c8f2232

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



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