Merge "Run lock before fingerprint enroll" into tm-qpr-dev am: e49a8448

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19260206



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