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

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

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

Change-Id: Ibb4d31b3d573a181f1486357c329887926715f13