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

Change-Id: I78b14e932635fd316fa96fc2cfadcdf9567e724c