Merge "Update FingerprintManager API after discussions."