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

Change-Id: Ice3f7d4a0a83a36411e6ad588b1ad57f3f87acd0