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 am: 7356eb5d am: 31f1b39f

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



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