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

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



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