Merge "Add re-enrollment notification for face AIDL" into sc-dev