Merge "Revert "Revert "Enable LOCKSCREEN_WITHOUT_SECURE_LOCK_WHEN_DREAMING for teamfood""" into udc-dev am: c991fc3c13 am: 5c8f2232d3 am: 83cc80e7e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23028360 Change-Id: I2a08f481edd806b8ae4464b02f8b4215921ccc75 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: