Merge "Use separate enroll timeout for fingerprint and face" into qt-r1-dev
am: c2f168ec3f

Change-Id: I303dceb0a30f93e151aab791fdf22a22b363f17a