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

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



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