Merge "Don't overtrigger face auth (ie: goingToSleep, lockdown)" into tm-dev am: 4dcb654f

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



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