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

Change-Id: Icc5a82e0a87e430636fcd206ba3ead477b5a6e7f