Merge "Do not use canAuthenticate() to check if user can reset lockout" into qt-r1-dev
am: 8f0cd6547c

Change-Id: I8455a428024d60680461f33335c3b267f8021bf2