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

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



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