Fixes regression from commit c358adad56.
Fix: 192420564
Fix: 188847063
Test: manual enroll face & fingerprint via setup wizard (on fp, face, & fp+face device variants)
Change-Id: If7027e4d0ddf9d73daf91f174f237e4eb1621ea7
Fixes regression from commit c358adad56.
Fix: 192420564
Fix: 188847063
Test: manual enroll face & fingerprint via setup wizard (on fp, face, & fp+face device variants)
Change-Id: If7027e4d0ddf9d73daf91f174f237e4eb1621ea7