Merge "Revert "Enable LOCKSCREEN_WITHOUT_SECURE_LOCK_WHEN_DREAMING for...

Merge "Revert "Enable LOCKSCREEN_WITHOUT_SECURE_LOCK_WHEN_DREAMING for teamfood"" into udc-dev am: 4eeba994 am: bbc40f8d

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



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