Merge "Remove isSyntheticPasswordBasedCredentialLocked()"