Merge "ResetLockout should be scheduled on FaceService's handler" into qt-r1-dev
am: 7809a34760

Change-Id: Iaad324d312f4b14d24f5f1722bfcaaafa35cae77