Merge "Properly remove fingerprints when removing device lock." into oc-dev
am: 98229bdf32

Change-Id: I98ed8a43e4644d709d9cb9ddeb799672a8fb6bc6