Merge "Don't auto-restart face auth after successful auth" into rvc-qpr-dev am: b3929f1e

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

Change-Id: If50fe417f115b59f603476f21b9f13b34be2e35a