Merge "Add onResume to FingerprintEnrollEnrolling" into oc-dev
am: 98b67a4e94

Change-Id: Ic3497ccbd63ba4e56ad1923f6b4d082e78c95b70