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

Change-Id: I4962cd7507ae324a264b23e46ee1dc00b1468938