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

Change-Id: Ic7136202d2d3b3ae48c0815e36d1e7a964736d03