Merge "Merge "Revert "Revert "Enable...

Merge "Merge "Revert "Revert "Enable LOCKSCREEN_WITHOUT_SECURE_LOCK_WHEN_DREAMING for teamfood""" into udc-dev am: c991fc3c am: 1e137512" into udc-d1-dev-plus-aosp am: 9202e7fe am: 189a7c04

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



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