Update and cleanup FingerprintManager API to new spec

Fixes bug 21040383

Change-Id: Ic2de8e4080f28cae963f567b7592df9fb8c76838
2 files changed