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

Change-Id: Idfccf73c4474d1ecf04ff53ed09a2f2894c39241