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