Merge "Prevent NPE on deleting fingerprint in Settings" into udc-dev am: 8b36777419
am: fba051fff0
am: 84da4a0141
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911556 Change-Id: I9752ee3aea2b76ddeb7829125047ac30fd5a9bef Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: