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

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



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