Merge "Enable stop_face_auth_on_display_off for all devices" into udc-qpr-dev am: 4afd5ed8

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



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