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

Change-Id: Ia7bd4bfcb68d882c3e1b4e8230ecba1d0b1aff0e