Merge "Merge "Use separate enroll timeout for fingerprint and face" into...
Merge "Merge "Use separate enroll timeout for fingerprint and face" into qt-r1-dev am: c2f168ec am: a4c2a68f" into qt-qpr1-dev-plus-aosp
am: 097fd9b9
Change-Id: I5342f6c94e2380bc476dfc94ead3757d7dab7a70