Merge "Revert "Copy startup & callback mechanism from fingerprint to face service.""