Merge "Fix fingerprint unlock stuck after renaming" into udc-qpr-dev am: bfa2feb3 am: 9ed0cee1

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



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