fix merge conflicts - SysUI co-ex updates

- Attempt face auth again on udfps start if we're not already
running face auth
- Use udfps touch, as an intent for device entry - so if udfps fails,
but face auth succeeds, enter the device (even if face auth is
non-bypass)

Test: manual
Bug: 193089985
Fixes: 194010665
Change-Id: Ied977fec9009265dac89b7e24c1075ceb2905bfd
Merged-In: Ied977fec9009265dac89b7e24c1075ceb2905bfd
(cherry picked from commit f2e79595)