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

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



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