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

Change-Id: Ibf345cd218ed7ab1b1cb136c9d906af85a1025b4