Merge "Add onResume to FingerprintEnrollEnrolling" into oc-dev