Merge "Minor cleanup: move logic that locks face whenever fingerprint is...

Merge "Minor cleanup: move logic that locks face whenever fingerprint is locked to the interactor" into udc-qpr-dev am: 3490e6fb am: 12c18c8a

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



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