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

Change-Id: I5b799c9e30efcd1e5254228b2c3db58f894d4f5f