Merge "Make FingerprintManager#hasEnrolledFingerprints per-user" into nyc-dev