Merge "Disable bypass if there aren't enrolled faces" into qt-r1-dev
am: 9369357e1d

Change-Id: I2591f861e338dda0d667874103e89c3833f707f8