Update and cleanup FingerprintManager API to new spec

Fixes bug 21040383

Change-Id: Ic2b279ffad47d31a6ad3beed7b3af5ad0a61e815
3 files changed