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

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

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