Merge "Enable "lift to retry" on face-auth devices" into qt-r1-dev
am: e4d39d199d

Change-Id: I8096a4f149e8cdd954b3108389c69ad0e5bf36ab