Merge "Prevent NPE on deleting fingerprint in Settings" into udc-dev am: 8b367774 am: 7771d0ea

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



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