Merge "Merge "Do not use canAuthenticate() to check if user can reset lockout"...
Merge "Merge "Do not use canAuthenticate() to check if user can reset lockout" into qt-r1-dev am: 8f0cd654 am: c3b9cf89" into qt-qpr1-dev-plus-aosp
am: 09018fec
Change-Id: I025b7126c29fda96906a12dfe5c122ced60ec306