Merge "FingerprintService - call PermissionEnforcer helper on methods annotated with @EnforcePermission"