Merge "Fix Device policy crashes after adding the account while checking isActivePasswordSufficient"