Merge "Skip ResetPasswordWithTokenTest on device w/o SECURE_LOCK_SCREEN feature" into tm-dev