Merge "Fix permission check in hasEnrolledFingerprints()" into nyc-dev